From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 26 May 2016 16:51:30 +0000 (+0200)
Subject: workspacesView: Consider workspaces-only-on-primary when scrolling
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~826
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2ad2853278c6ad51005eaec9e6921d003c5abe83;p=gnome-shell.git

workspacesView: Consider workspaces-only-on-primary when scrolling

It is odd to switch workspaces using the scroll wheel when the pointer
is on a monitor without workspaces, so only handle scroll events on
non-primary monitors when workspaces-only-on-primary is disabled.

https://bugzilla.gnome.org/show_bug.cgi?id=766883
---

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index aaa9522fd..f8217cffd 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -674,6 +674,11 @@ const WorkspacesDisplay = new Lang.Class({
     _onScrollEvent: function(actor, event) {
         if (!this.actor.mapped)
             return Clutter.EVENT_PROPAGATE;
+
+        if (this._workspacesOnlyOnPrimary &&
+            this._getMonitorIndexForEvent(event) != this._primaryIndex)
+            return Clutter.EVENT_PROPAGATE;
+
         let activeWs = global.screen.get_active_workspace();
         let ws;
         switch (event.get_scroll_direction()) {